bitkeeper revision 1.1159.17.6 (41193a207z6kESTDa2SXhULAPY-Bmw)

Fix the broken build. Also avoid floating-point code in Xen.

diff --git a/tools/libxc/xc_linux_restore.c b/tools/libxc/xc_linux_restore.c
index 1ce1837e35ee6201384bbc84290227328a911d09..62050c83eba91bf87a7141b6934f939b76b66a5c 100644 (file)
--- a/tools/libxc/xc_linux_restore.c
+++ b/tools/libxc/xc_linux_restore.c
@@ -224,8 +224,7 @@ int xc_linux_restore(int xc_handle, XcIOContext *ioctxt)
 
     /* XXX create domain on CPU=-1 so that in future it auto load ballances by default */
     if ( xc_domain_create( xc_handle,  nr_pfns * (PAGE_SIZE / 1024),
-                          name,
-                          -1, 1, &dom ) )
+                          name, -1, &dom ) )
     {
        xcio_error(ioctxt, "Could not create domain. pfns=%d, %dKB",
                   nr_pfns,nr_pfns * (PAGE_SIZE / 1024));

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 2ecca1fffed8470a22fc08b501a99da2487de347..e419bba51462165d523288730b49d3466b6c6374 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -8,6 +8,9 @@ CFLAGS  := -nostdinc -fno-builtin -fno-common -fno-strict-aliasing -O3
 CFLAGS  += -iwithprefix include -Wall -Werror -fomit-frame-pointer -pipe
 CFLAGS  += -I$(BASEDIR)/include -Wno-pointer-arith -Wredundant-decls
 
+# Prevent floating-point variables from creeping into Xen.
+CFLAGS  += -msoft-float
+
 ifeq ($(TARGET_SUBARCH),x86_32)
 CFLAGS  += -m32 -march=i686
 LDFLAGS := --oformat elf32-i386 

diff --git a/xen/common/sched_fair_bvt.c b/xen/common/sched_fair_bvt.c
index 165c128753e09314e27a4e43243bc4be7aa778e3..ac37c582ebfdd73af61dfe0c00e7d6b1685512f7 100644 (file)
--- a/xen/common/sched_fair_bvt.c
+++ b/xen/common/sched_fair_bvt.c
@@ -252,7 +252,7 @@ static void fbvt_wake(struct domain *d)
          * values, the virtual time can be determined as:
          * SVT - const * TIME_SLEPT
          */
-        io_warp = (int)(0.5 * inf->time_slept);
+        io_warp = inf->time_slept/2;
         if ( io_warp > 1000 )
             io_warp = 1000;
 
@@ -551,7 +551,7 @@ static task_slice_t fbvt_do_schedule(s_time_t now)
      * domains earlier in virtual time). Together this should give quite
      * good control both for CPU and IO-bound domains.
      */
-    LAST_VTB(cpu) = (int)(0.2 * next_inf->time_slept);
+    LAST_VTB(cpu) = next_inf->time_slept/5;
     if(LAST_VTB(cpu) / next_inf->mcu_advance > max_vtb / MCU) 
         LAST_VTB(cpu) = max_vtb * next_inf->mcu_advance / MCU;